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

am skip reason: Merged-In I6739dd4f948cc6499c4fa66f5569b7be82aa38ad with SHA-1 dab1905142 is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/2038704

Change-Id: Id159586ab61ccd6d6679ea2190ec5725d4017b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>