[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b -s ours am: a5f045da44 -s ours am: f6d5e9eafc am: 67c9729b65 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If089a6ee3cfc31ad8926e134158d5e423d49b2f1