Merge changes from topic "am-dbb0a724ed984c459be13d99d31cd46f" into android12-tests-dev

* changes:
  Merge changes from topic "am-2a4eac22b6c748278a46f02f38a06b70" into android11-tests-dev am: 11c115df2a
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CTS test failure by skipping LAUNCH_PERMISSION_SETTINGS permission" into pie-cts-dev am: d63e6ac8d6 -s ours am: cfb598b555 -s ours am: 6827512931 -s ours