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

Change-Id: I855cad4736a22d0ea33e8db6fa9ef909507fd9bc