Merge "ParcelFileDescriptor: improve javadoc." am: c4e2b24d87
am: bc7222d46d

Change-Id: I4a6d999b503985a84f44ad487bb36a505d80de6a