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

am skip reason: subject contains skip directive

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

Change-Id: I6d65bb60b66e40827f6f137a25c2be6b23ee8875