Merge "Add CtsScopedStorageDeviceOnlyTest to StorageManagerService presubmit"