Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am:...

Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f -s ours am: 15d348e4 am: 3d3389fb -s ours am: 139e752d am: 84e13706" into rvc-d1-dev-plus-aosp am: 52661dce

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

Change-Id: I9810454467e37b6fa6b7ed96769f420cada45337