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