Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca"

* changes:
  [automerger skipped] Merge "Mark ab/8389834 as merged" into android12L-tests-dev am: bb7b3f83b2 -s ours
  [automerger skipped] Mark ab/8389834 as merged am: bf9bca7c70 -s ours