Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev am: afe0f89d am: 1c4f7f8d Change-Id: I3b095ab6b3921181afd49ddcfb2fc1c4ae3eddde