Merge "Skip resuming activities on sleeping display" into rvc-qpr-dev am: 982735658a

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

Change-Id: Ib193b7cbf8199f4c563ebe1a59bdb3aae297c29a