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

* changes:
  [automerger skipped] Merge "Use type safe API of readParcelableArray" into sc-qpr1-dev am: 5cbc21c4 -s ours am: ef788ab3 -s ours am: 0efa7654 -s ours am: 450bd6df -s ours am: 33aff601 -s ours am: 1ebcd943 -s ours
  [automerger skipped] Use type safe API of readParcelableArray am: e6b8c619 -s ours am: 75e0d60b -s ours am: 699dac9b -s ours am: a2de6ea8 -s ours am: 752f526c -s ours am: 425d7e68 -s ours