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

Change-Id: I0d0a533d0fccd16e6d8ab7f53359434a46f54c57