[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 -s ours am: 63ff1ff1 -s ours am: 4436ac28 -s ours am: bc84ba38 -s ours

am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 391aaf65 is already in history

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



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