Merge "healthd: uses android.hardware.health@2.0-service_defaults" into stage-aosp-master