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

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

Change-Id: Ic9deac6ba9f461eb7b49dd19af34f762b35f5d4c