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

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

Change-Id: I872dbd31adfd8424d814f8fe95f16eb78e53b82a