[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 skip reason: subject contains skip directive

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

Change-Id: Ic1fb1bbf38784fe03612cf65a4bc33032a4d5b7e