[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours am: 6766245f am: e52ac322 am: ec730b6a -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: I9ccdc8071701af2589bc0e7416124444e202f74a