Merge "[automerger skipped] Merge "Disable apex update for GSI" into qt-dev...
Merge "[automerger skipped] Merge "Disable apex update for GSI" into qt-dev am: 66893b69 am: 9008e80c -s ours
am: 9a504274 -s ours
am skip reason: change_id I08fd7a1b254aac276926329e064c35b714764936 with SHA1 9550ce16 is in history
Change-Id: I78c3fff7eb0937ac753c462c7d3a6fe9e3d043e2