Merge "Merge "[RESTRICT AUTOMEGE]Adapt StorageTest for Wear" into android11-tests-dev" into sc-v2-dev