[automerger skipped] RESTRICT AUTOMERGE am: 3c2fece4a5 am: 73f0570cea -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46cc3698eb16bf0f438288ebfe4e67aa4c38c46d