[automerger skipped] Merge changes...

[automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d -s ours am: f7c3a7b3 -s ours am: 1983d042 -s ours am: 516e1646 -s ours

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

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

Change-Id: I3bcb2209d572c1f9c77c9ef96da2300d4bb20f12