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

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



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