[automerger skipped] RESTRICT AUTOMERGE am: 486773ff -s ours am: 56cc3b82...

[automerger skipped] RESTRICT AUTOMERGE am: 486773ff -s ours am: 56cc3b82 am: 175d275b -s ours am: 282a2a51 am: 6880e2e6 -s ours am: 03bd71db -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib810d1a8eeec63c70703a4dc90319e130576576a