Merge "Fix USB access control when adb is disabled." into mnc-dev