Merge "vold: temporarily re-grant access to default proc label" am: c0e58ac9bf am: 95153a8a16
am: 948c53b3df

Change-Id: I7325c01eab384f0e01a370e5527a15754f589db8