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

Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d409 am: 1a7736be am: 1d798b51 am: 660289f6

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



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