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

Change-Id: I5cf4debb08e2341941639abcae87d44bdd71f4fe