[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-mainline-prod am: 2b01f3d2 -s ours

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

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



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