Merge "vold: temporarily re-grant access to default proc label"