Merge "Device always wakes up when the bouncer shows" into tm-qpr-dev am: 182cf81d

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



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