[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319...

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38