[automerger skipped] Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc9279c am: 0ce5f01cbe -s ours am: 336d802268 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I31335b1a699aa9029a1d73d5281428755b09c687