Merge changes from topic "am-8bb215cb07a04148a83a1ddbc3dee1d3"

* changes:
  Merge changes I52110b84,I15d10a19,I5f52b832,Ifbaceb47 am: 803648a957 am: d89768f5a2 am: 8413d3041b am: 8d32fefac4
  [automerger skipped] Migrate BackgroundDexOptServiceIntegrationTests to androidx.test am: 3bc264d1a0 -s ours am: f1383e0c59 -s ours am: a06b665bef -s ours am: e270b11375 -s ours am skip reason: change_id I32fe3297656eec6060da6c7e24582bcd5315fb16 with SHA1 502ec7ae4b is in history