[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-qpr1-dev am: cbe7773d85 am: 2286cc8341 -s ours am: 1734762e27 -s ours am: 1e4fde43df -s ours am: 56fdc1ad15 -s ours am: 5e4d13c3fe -s ours
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19369770
Change-Id: I9beab931e2825d3e3759c227fdfb88f621b421df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: