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

Change-Id: Ic04a4abbbc9494ab8e380020e67fc0ac9a681be2