[automerger skipped] Merge "Handle ParcelableException instead of crashing system server" am: 592266cbf1 am: 48a435ea89 am: 435cf631bd -s ours
am skip reason: Change-Id Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5 with SHA-1 8ce32fe577 is in history

Change-Id: Iaacc2809364d73bb4752e1484f0f65fc5b466129