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

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



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