Merge "Remove usage of healthd." am: 1978bd15ca am: 10d9a6b84c am: 7631cf0270 am: 85008dcd71 am: 110470fea5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1861916

Change-Id: I2435062e19a458b30417356b831ad846a5183937