[automerger skipped] RESTRICT AUTOMERGE am: c99b04ebad -s ours am: 31d35297fd am: b4d16b75b6 -s ours am: 0b8cc3354e am: d4304422a9 am: 0eb14db5d6

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

Change-Id: Id3a2bd0e3d7017d16f728e2732fa19bcb93f8bc7