[automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d2a -s ours

am skip reason: Change-Id I34d7ee3b84bc351d58ebf024a7ed10dd7db1f55b with SHA-1 b793c2174e is in history

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

Change-Id: Ib8be84cadc90e1d2dc4940be51d43a131e7d7477