[automerger skipped] RESTRICT AUTOMERGE am: e05538421f am: 28921fe615 -s ours am: 9ab0bce3e8 am: ca804e468c am: 4274fa4dca

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

Change-Id: I4aff10a6404b830a8900d68a8fa2601b8bcd61d8