[automerger skipped] Merge "Wake-up device before showing bouncer from AoD"...

[automerger skipped] Merge "Wake-up device before showing bouncer from AoD" into sc-v2-dev am: b92bc421 am: 9ccc5cff -s ours

am skip reason: Merged-In I83f17c1cd128c2bb94a9adbede1881d194f6bf21 with SHA-1 956f3790 is already in history

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

Change-Id: I15d64337c2ebbe64bbe55050d237392f0e462c91