[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319...

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2