Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev