[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

Change-Id: Ie7a10b6de46bb1675067864d40595eb128a76922