[automerger skipped] RESTRICT AUTOMERGE am: feb4dd913c -s ours am: ef72a9b8c4 am: 7a85d4deb2 -s ours am: be115041b2

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

Change-Id: I8bc5cbbfa883857c608a9f8fde4a6c28b511b90e