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

[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f -s ours am: 15d348e4 am: 3d3389fb -s ours am: 139e752d am: 84e13706 am: f24fde15

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

Change-Id: I494b9fc1c7361599e7d83123e3344e02995ecd92