[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-qpr1-dev am: cbe7773d am: 2286cc83 -s ours am: 1734762e -s ours am: 1e4fde43 -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: If18aae1d8279aa7de647baf4de33c6cd05a707c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>