Merge "Revert "Temporarily additional stats into battery dumpsys"" into sc-dev