[automerger skipped] RESTRICT AUTOMERGE am: feb4dd91 -s ours am: ef72a9b8...

[automerger skipped] RESTRICT AUTOMERGE am: feb4dd91 -s ours am: ef72a9b8 am: 7a85d4de -s ours am: be115041 am: f39c6395 am: b1813fea am: 9ea98fbd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3aa4814d31835fd6e1a4da412b8d65b9a1c7b9e4