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

Change-Id: I031c3238d57583bf0d041f00fa33e586d5984316