[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: ed6a6324 -s ours am: 97646fd3 -s ours am: bb638567 -s ours am: 7c2b4e99 -s ours

am skip reason: Merged-In I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 a13fc7f3 is already in history

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

Change-Id: Ib0be1f3c1974993ff8130f2ecc4a17f0b1ebb3e6