[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: be18ee4c

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

Change-Id: Idb8962d1d1f00b6e205314dfeb139d3acf437630