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

Change-Id: Ibc7ee343726fdc11563b871c1773354a952bd5ec