Merge "Remove testPrimaryNoAccess testing no access to external storage directory."