[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: Ie87daa277dfabe4fd63f4fa0f9e6c7d1325761f5