[automerger skipped] Merge "DO NOT MERGE Re-implement reading/writing...

[automerger skipped] Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc927 am: 0ce5f01c -s ours am: 336d8022 -s ours am: 56bc1078 -s ours am: 2e2dbf73 -s ours am: 510283ef -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16406531

Change-Id: Iebb88848d6b1b371849084d774e5dd153a81cec1