Merge "Add comparison operators for ParcelFileDescriptor" am: ad425b4c2a
am: 250cdb3d80

Change-Id: I68dc6458e7c4abc60f561d6043a83299ded4a70f