[automerger skipped] Merge "Change the wait time of setDefaultLauncher from...

[automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d72 am: 26e6bddf am: 3529942a am: ee8be1b4 -s ours am: ba4d1a41 -s ours

am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 4df0bbaf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455828



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