Merge "Add stats from storage manager to dumpsys result" into pi-dev