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

Change-Id: I302857a4e6e6da36656d0a101275f174c902f45d