[automerger skipped] RESTRICT AUTOMERGE am: 79062d7903 -s ours am: 6f14b9586d -s ours am: 6f46168580 am: 7306f907e4 -s ours am: c83a8122e4 am: 4d8bcc65c2

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

Change-Id: I3ce3cc4b844ef5bd3c23e3b796268c4dab9a9eb5