[automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75...

[automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f94 am: 2d13812c -s ours am: 6acd16a5 -s ours

am skip reason: Merged-In I61c32c7454771583e252c5d23f5d41728472c41b with SHA-1 fc0d0bc3 is already in history

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

Change-Id: I2d5e7ed3fe9d1e637fa3164216dbbbdd8fe63e26