Merge changes from topic "am-192633db46b649bf9690612c0e1bbe0f" into main
* changes:
[automerger skipped] Merge changes from topic "cherrypicker-L40500030010147113:N80100030172488922" into aosp-main-future am: 9393a2f5 -s ours
[automerger skipped] Make PackageManager call into ART Service for incremental apps. am: e3a1db43 -s ours