Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into...

Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d72 am: 26e6bddf am: 3529942a

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



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