Merge "ParcelFileDescriptor is movable" am: 7004211755
am: 986fd0fce4

Change-Id: Ica31a5cd404207e2802cad839f84f8f22ac9a4ad