Merge "Do not use hidden API ParcelableException"
am: e777c27788

Change-Id: I640e1f6aa16ef101ac5eeabbe9ce4d911e57b308