Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev am: afe0f89d59 am: 1c4f7f8ddd am: 3d45902ba3 am: 49d1d87960 am: 30c8b7d726
Change-Id: I8c8ed0de0ef8bf5e745c1aeac04c16d150b1ab8a
This commit is contained in: