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

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

Change-Id: Id4696141e2b3076a33d52c98ef4677100a327064