[automerger skipped] Merge "Wakeup the screen for full screen intents" into...

[automerger skipped] Merge "Wakeup the screen for full screen intents" into sc-v2-dev am: 35185d54 am: 323cdd95 -s ours

am skip reason: Merged-In If4a5d3dbd49367ddd7dc2895b83471d52fcfa47a with SHA-1 8bbccac4 is already in history

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

Change-Id: Ic56d539b427097a505f74e2103adc4e72a913aaa