[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c am: 4d587c5a -s ours...

[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c am: 4d587c5a -s ours am: 3c24d07d am: 19456a4b am: 457a3807 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec93b30f5c42beb356b9f247e7a8c52e62fbdd7