Merge changes from topic "health-service-wrapper-test"

* changes:
  health: Drop HealthServiceWrapperHidl.init.
  BatteryService: remove HIDL-ness
  Move BatteryServiceTest to HealthServiceWrapperTest.