[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: 2c4a99cd am: 35b88a2a -s ours am: cd470cd6 -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: I1b31faab69338eb3adce2c79013df2a7c3466d65