[automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d72 am: 26e6bddf am: fa2f72a2 -s ours am: 60cced62 -s ours am: f9b7140d -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: I72ef88fad65c31edd583556c74640da1b78f2cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>