Merge "healthd: *charger_test links to a.h.health@2.x statically." am:...

Merge "healthd: *charger_test links to a.h.health@2.x statically." am: c7facae9 am: 51f11baa am: ce525601

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1920840

Change-Id: I68a176fa7a0fb91c154721d094928cd0b66afdff