Merge "Do not wait for invisible activity when turning on screen" into...

Merge "Do not wait for invisible activity when turning on screen" into tm-qpr-dev am: 0c8d32f8 am: 393cc825

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



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