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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-dev am: 2825fd08 am: e76e8cc3 am: 75e998cf am: a60eb2ec -s ours

am skip reason: subject contains skip directive

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

Change-Id: I18e88e6d207e94b899d8ce0b54147133c44a10f4