[automerger skipped] Merge "Device always wakes up when the bouncer shows"...

[automerger skipped] Merge "Device always wakes up when the bouncer shows" into tm-d1-dev am: b2229f28 am: 46bbd905 -s ours am: 4fbbe8ca -s ours

am skip reason: Merged-In Ib79f54a9c25adeaabdf90039bc04a3dea0ad26a2 with SHA-1 54021917 is already in history

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



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