[automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bdb66b2c06a2a1ae249c0eb31dac2ae8101fbbb