Merge "Wait for launcher is shown after calling pressHome" am: a814e9c364 am: 872f164110

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301493

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