The USB configuration screen under Developer Options hasn't been updated for the new USB access control changes. Update it. 1) Ensure that the default in Development Settings is "Charger Only". 2) Changing USB mode in developer settings only changes the USB function. It doesn't unlock any USB data. Bug: 21258972 Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9