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

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

Change-Id: Idd714e0e40b4457db394033128aa352894be21e9