[automerger skipped] Merge "Use type safe API of readParcelableArray" into...

[automerger skipped] Merge "Use type safe API of readParcelableArray" into tm-qpr-dev am: 1a039234 -s ours am: a90259d3 -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 2c993153 is already in history

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



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