Merge "Setup AnrController for StorageManagerService" into sc-dev