[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am: a752bb77 -s ours am: 265548df am: 7edd80a2

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

Change-Id: Icb2753a1f5d72cc7f3ad22f6d6e365319983f9f1