[automerger skipped] Merge changes...

[automerger skipped] Merge changes I8c01f31d,I0a2b90d1,I78bfa0d1,I803f9df1,I3ad42802, ... into tm-qpr-dev am: d83bec70 am: 62e5fd57 -s ours

am skip reason: Merged-In I8c01f31d715c754f1449b75fa7c754fe61b04d4a with SHA-1 212af5e0 is already in history

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



Change-Id: I81cfe5a38d3d582f32bb3cacd8b72f9db1f1fca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>