[automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d7279 -s ours am: 63ff1ff1cc -s ours am: 4436ac28f3 -s ours
am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 391aaf65c5 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455828
Change-Id: Iad327cf764f74d882d256783880ac3a33aba3969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: