[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: b445d8d9 am: c87f3f1a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5b555d24bd06542968ebd07026c592caa9656ef1