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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399 am: 94fd0add am: 91c1e95f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b8051c0eb707215d8e4f49fbe5a4a7b38b70f28