[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 278c4994 am: 447bb685 -s ours am: ec9f3efc

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

Change-Id: I6377a43d8de500cc0440c11ff35db0ba8c891b2d