Merge "Device always wakes up when the bouncer shows" into tm-d1-dev am: b2229f28

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



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