Merge "vold: temporarily re-grant access to default proc label" am: c0e58ac9 am: 95153a8a am: 948c53b3 am: fd18e3c4 Change-Id: I4ecf0b3b20de03713c7647ffeaed735b02868fa3