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

* changes:
  [automerger skipped] Merge "Add a function to wait for the setting of preferred payment" into android11-tests-dev am: 48e5cea873 -s ours
  [automerger skipped] Add a function to wait for the setting of preferred payment am: e65248958b -s ours