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

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



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