Merge "Enforce declared permissions on getCellularBatteryStats() and getWifiBatteryStats()" into sc-dev