[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

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

Change-Id: I658a7a3ac41c8e48d8d6fd8ee455cd9136edb2fd