[automerger skipped] Merge "Skip resuming activities on sleeping display" into...

[automerger skipped] Merge "Skip resuming activities on sleeping display" into rvc-qpr-dev am: 98273565 am: 79a5c2bf -s ours

am skip reason: Change-Id I7f08e09fb9273a3ae7855728ed6f4eb1b7fdb206 with SHA-1 329c60d4 is in history

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

Change-Id: I3df05963c52fb998c30b35fce6b5862dd3a60d7f