Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev am: afe0f89d59 am: ac51802720 am: 2c8af416c6
Change-Id: Icddf3e55c57684f7b28eb6b9ae78de26103d7f0a
This commit is contained in: