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

Change-Id: I27c7e64fdeaa1dd64f7877ab7d77cefb7ec9f24e