[automerger skipped] RESTRICT AUTOMERGE am: 7faec2493b am: eb827bb278 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idb1b615c8a3f0a13ea7eb64ba2098e5f4be4fee0