[automerger skipped] RESTRICT AUTOMERGE am: 43e8c61bee am: a7b5d8209d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief20fdedef4f34d62783817b375be4967d980940