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

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

Change-Id: If1d6bd0f973c051ab19442ac65c33d8405124abd