Merge changes from topic "am-ef54cdcc7e34474ca5a8849467f05dd8" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Use type safe API of readParcelableArray" into sc-dev am: 9b25897c -s ours am: 9e6d9da6 -s ours am: 9cddcdf1 -s ours am: 315cdc5b -s ours am: c4bf19e7 -s ours am: b5b5d40d -s ours am: 90c2363a -s ours am: d4e2af33 -s ours
  [automerger skipped] Use type safe API of readParcelableArray am: 0362efc0 -s ours am: 1ea48d41 -s ours am: b58f82b9 -s ours am: a9266085 -s ours am: 00b7d507 -s ours am: 5ccc993e -s ours am: e1a59325 -s ours am: 87d7fe88 -s ours