Merge "ResetListener in StorageManagerService"
am: 6b3a5194d9

Change-Id: Ibb3e89017328e2414d11078915913781d7aba226