[automerger skipped] RESTRICT AUTOMERGE am: 9ec3bf497e am: ee729e7a92 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I747411b5c226e3ae18f77ec3ffb792806e95c0cd