[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: I494b77537b0a40a3ef05ffe0705e33e2ffc9d2d9