Health@2.0: IHealthInfoCallback uses 1.0 HealthInfo.

BatteryService does not use these fields for posting
sticky intents.

This is a partial revert of commit
cbfb15e0b89d8247ce2ef2a21ee5f691f1c73be5.

Bug: 63702641
Test: boots
Change-Id: Id6596b04daaa19ae97d783c7a8bc111a43725334
diff --git a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
index a19a4a4..9b86873 100644
--- a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
+++ b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "mHealthhidl_hal_test"
+#define LOG_TAG "health_hidl_hal_test"
 
 #include <mutex>
 
@@ -35,6 +35,7 @@
 namespace V2_0 {
 
 using V1_0::BatteryStatus;
+using V1_0::HealthInfo;
 
 // Test environment for graphics.composer
 class HealthHidlEnvironment : public VtsHalHidlTargetTestEnvBase {