Merge "Improve @hide Parcel.hasFileDescriptors(Object)"