[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0 -s ours am: 2fffbcb7 -s ours

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea74 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c19517a358f1f8cc69bdf18f00d99cdf05c573