[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb89ffd735b559380e1ce321b0a8d1170ab44f2e