Merge "Wake-up device before showing bouncer from AoD" into sc-v2-dev am: b92bc42153

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

Change-Id: I0ae596f28d67e14153a1e8f3bc604b7cf79c2ed7