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