Merge "Fix StorageManagerTest" into android11-tests-dev