Merge "CDD: Require user consent UI before allowing USB access to storage" into mnc-dev