Merge "Add READ_DEVICE_CONFIG and WRITE_DEVICE_CONFIG permissions to the Shell."