[automerger skipped] [automerger] Increment when attempting to read protected...

[automerger skipped] [automerger] Increment when attempting to read protected Parcel Data am: 6a825e8a am: 7ae915f9 am: 21c05cbf am: 0f23470e am: 4af41a29 am: 75061f17 am: d9d1fbf2 am: e1794e5b am: 634696f9 am: c78029ca am: 3884672b am: 21a1c612  -s ours
am: 8d4954c5  -s ours

Change-Id: Iec5462d131384b6e540a83683819492dede05b2f