Merge "[automerger skipped] Merge "Do not use hidden API ParcelableException" am: e777c27788 am: b35b54f79b am: 6b4a5300e8 -s ours am skip reason: change_id I92dd527aad1e174871c330d1c043189407e136cb with SHA1 1542314273 is in history"