Merge "[automerger skipped] Merge changes from topic...

Merge "[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-qpr1-dev am: cbe7773d am: 2286cc83 -s ours am: 1734762e -s ours am: 8c2d0f6e -s ours" into tm-d1-dev-plus-aosp am: 71e463bf -s ours am: 18b177e8 -s ours

am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f4 is already in history

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



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