Merge changes from topic "am-1eb4fbb571b84beb9f16a5551fc50b2e" into android12-tests-dev

* changes:
  Merge changes from topic "am-f48b299039ae466b85b0322b368bf83e" into android11-tests-dev am: 3612aea8dd -s ours
  [automerger skipped] Merge "Google RCS uses FTEU MO SMS for phone number verification Test [ Week 08, 09 & 10]" into android10-tests-dev am: 3631f60ea7 -s ours am: 2c79f3d592 -s ours