Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f am: 1a7736be63 am: 1d798b51c0

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

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