Merge "Remove usage of healthd." am: 1978bd15ca am: 10d9a6b84c am: 7631cf0270

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

Change-Id: Ia4d5abcc2625be068ee1e35733fc2be85ab18a1a