[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: b4618e45 am: 0bc53931

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

Change-Id: Iea7f28ddccf8042eee05b6b5c02e6d1f3c805126