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 am: c46d223e
Change-Id: I343ab84a716c9fdcddb80643e64413abe1dc1bbf