Replace package variant specific APK keys with a single one. am: 6da456969b am: 7dbdae85df
am: 5ccbba7008

Change-Id: I44816328b4800f57ccf4f92f4231e767e8252004