Merge "Add a function to wait for the setting of preferred payment" into android12-tests-dev