[automerger skipped] Handle ParcelableException instead of crashing system...
[automerger skipped] Handle ParcelableException instead of crashing system server am: 67c89f3e -s ours
am skip reason: Change-Id Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5 with SHA-1 665838e7 is in history
Change-Id: Ie30f1a2cdbd5af09d14209e5d219f225a84bedfa