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

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

Change-Id: Ib7fdfd16e9d6cc87c270d2a8edc499f412f909e2