[automerger skipped] Merge changes from topic "aosp-apk-in-apex" am: c7a4eec435
am: 76e5550933 -s ours
am skip reason: change_id I8ae4e331d09b4734c54cdc6887b273705dce88b1 with SHA1 46e6a0b1ff is in history

Change-Id: I2b78f05de456005f77056e1f6e664618a8a8bbe0