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

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



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