[automerger skipped] Device always wakes up when the bouncer shows am:...

[automerger skipped] Device always wakes up when the bouncer shows am: 54021917 -s ours am: bf0badf4 -s ours

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

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



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