[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am:...

[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am: a752bb77 -s ours am: 265548df am: 9a1341ec am: ca3faf1e am: c8f4fd02 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9108da52be0778ef2b220d17d466f11e89f29c9e