[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 skip reason: subject contains skip directive

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

Change-Id: Icc723ca81147b1c9eccbb3a2188a79c7cf216fa4