Merge "libhealthloop: Remove the POWER_SUPPLY_SUBSYSTEM macro" am: 652b89bd0a am: cb27f8cccb am: ae389f2b16

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1864853

Change-Id: I07a100c875a4a735175276d06034d8ae51f53919