[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: a5ab8308 -s ours am: cfe09d4e -s ours am: 34b885dc -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: Ib50af630e288129a9bfb8ccb043016d227aa4fea