[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0a am: c2a8913c am:...

[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0a am: c2a8913c am: 12b25096 -s ours am: a5f045da -s ours am: f6d5e9ea am: 67c9729b -s ours am: c53f9fcd am: 08e1fc6b am: 880d0ff3

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

Change-Id: Ia1a7e2bbdf2b0f30155523f5189fc01695a54186