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

am skip reason: subject contains skip directive

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

Change-Id: I3c80f6706adf13f4b5bfdc9464c6996368cd480d