[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: 26dd6092 am: 4593311b am: f95d6064 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I18e42425076ec3d9ff070b70cb33276bb63fa97b