Merge "healthd: Don't take device-scoped battery as the main system battery." into rvc-dev