[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f -s ours am: 15d348e4 am: 3d3389fb -s ours am: 139e752d am: b4618e45 am: 0bc53931 am: cfc15e75 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3cf5dd97e16794c33d564a9e2f50af30c0608045