Merge changes from topic "am-5a913a13cc874e3f8397bda8898f8afa" into android12L-tests-dev

* changes:
  Merge changes from topic "am-a1bb476f0d2947a38a518b0ef4b10dcc" into android12-tests-dev am: 656faf0db0 -s ours
  [automerger skipped] Merge changes from topic "am-c21cfd67b7fc45299f9d53a6dcb7e7b4" into android11-tests-dev am: b179993c26 -s ours am: ef5ed50374 -s ours