[automerger skipped] Merge "Support Parcel.write/readFileDescriptor" into...

[automerger skipped] Merge "Support Parcel.write/readFileDescriptor" into aosp-main-future am: c3c2d8da -s ours

am skip reason: skipped by omakoto

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



Change-Id: Iff9c72212ef51abc7e1412d4a1d2e851851273ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>