[automerger skipped] Merge "Do not use hidden API ParcelableException" am: c1faf5b1e4 am: dcb1f5894c
am: c00952cce3 -s ours
am skip reason: change_id I549f1316824857cdb6f4bbd47e6789eda0dcadd7 with SHA1 d8921f4ad2 is in history

Change-Id: Ieab0deaeba903dae1513b583623457f132e1fd57