[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c am:...

[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c am: a9c08f43 am: b2e6bdfc -s ours am: 1411e29a -s ours am: b9161617 am: 85597ef7 -s ours am: 53e36247 am: 6ae5decf am: 4dca2649

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

Change-Id: I5b33bb67570f7a1136a7459979f940bdc3900934