[automerger skipped] RESTRICT AUTOMERGE am: 9ec3bf497e am: ee729e7a92 -s ours am: a552fc21c7 am: 811352be16 am: 7f4460ab0d

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

Change-Id: I5a451c8a23af4ea7cdae1d14367e9c252c226dc6