[automerger skipped] Merge "ResetListener in StorageManagerService" am: 6b3a5194d9 am: 493110e0b4
am: d17dabf5dd  -s ours

Change-Id: I293ab73d96d0e042869042b5baa1a46c1e7469c0