Merge "healthd: Don't take device-scoped battery as the main system battery."...
Merge "healthd: Don't take device-scoped battery as the main system battery." into rvc-dev am: 57db9db4 am: 6411d160
Change-Id: I1fd9103511ac7e978707b2eff617a83bb2bdada8