Merge "Fix FrameworksServicesTests:StorageManagerServiceTest"