[automerger skipped] [automerger] Disallow reading object data from Parcels with non-object reads am: f784183c17 am: c6ae5cf9c5 am: 22b5950994 am: f4dc4cd4a3 am: 81a160b19e am: 2d14de5c70 am: 9f92221278 am: 2de1de1499 skipped: e6373f11f4 am: 2944d59824  -s ours am: 48e490bbc6  -s ours
am: 1f58c3119c  -s ours

Change-Id: I702558446a7430a7a1c7b286704d3ef95dc8aada