Google and Epic Games have filed a joint proposal for changes to Android and Play Store to end their litigation for good.