[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: a7ec8038 -s ours am: 6590d4b5 -s ours am: b8fccc9e -s ours am: d6a1b545 -s ours am: 533733dc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I732c7c577b9ca505e5e63a4678400eb48c119e5a