[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -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: I8bc4d6f366fab119da399da1a1a37024c4717dde