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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59451725f8eea4a9a6587d7f8d3272a24ee486e4