[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update the visibility of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-qpr-dev am: 2c1181cc am: db5cafa8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifced379e7dcfba01dc95a251cf4e0ef8b7b06173