Merge changes from topic "am-714ccad727ee4b7f9f6b9ae3e0ec2edd"

* changes:
  Merge changes from topic "am-7a5d5f4d7134450e9e742d48a1dc7041" into android12L-tests-dev am: 77f338df
  Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE ValidateMediaProfiles searches multiple directories" into android10-tests-dev am: 1b2ea77a -s ours" into android11-tests-dev am: 38b7a720 -s ours" into android12-tests-dev am: 47985364 -s ours am: ed746bcf -s ours