Merge changes from topic "am-c9d7d15b50464f4f89f6e75fa6756acd"

* changes:
  [automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d7279 -s ours
  [automerger skipped] Change the wait time of setDefaultLauncher from 20s to 60s am: 4df0bbaf93 -s ours