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

* changes:
  [automerger skipped] Merge "Use type safe API of readParcelableArray" into sc-v2-dev am: 81a783a8 -s ours am: ca68aba8 -s ours am: 8e4d4bd3 -s ours am: 8ee34a47 -s ours am: 22966492 -s ours am: eb85fd9c -s ours
  [automerger skipped] Use type safe API of readParcelableArray am: 7491a49b -s ours am: 1dcde0a0 -s ours am: efda83cf -s ours am: 1d2226b2 -s ours am: 4e75ad91 -s ours am: 59fb0d60 -s ours