Merge "Add resource overrides so that CarStorageMonitoringTest stores samples regardless of the underlying target configuration"