[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: 35b67cc7 am: 287e7db4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If5b79a0ea0b4fa1282db91ea59d0cc344ebe7c14