[automerger skipped] Merge "RESTRICT AUTOMERGE" into rvc-qpr-dev am: 8815b57536 am: 7daa32adac -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib9e83a99c83610c6492268ba82d6126370a5aaa9