Merge "ParcelableHolder/ParcelFileDescriptor toString" am: df1bcf8478 am: 3efbdb09d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2371159

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