Merge changes from topic "am-6b765d220b464f71a94f5e0c2eeeea49" 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: 563c813e -s ours am: 9aa0bc91 -s ours am: efc9b2c3 -s ours am: a63a66bf -s ours
  [automerger skipped] Use type safe API of readParcelableArray am: e6b8c619 -s ours am: 75e0d60b -s ours am: 699dac9b -s ours am: 33f02f29 -s ours am: 82b222eb -s ours am: 443ea317 -s ours am: d19093d5 -s ours