[automerger skipped] Merge "health: batterymonitor uses AIDL HealthInfo." into...

[automerger skipped] Merge "health: batterymonitor uses AIDL HealthInfo." into tm-dev am: 9ccbc892 -s ours

am skip reason: Merged-In I660e8ac0d1897ce30e3ae5d4f402a0b9ccac3c5c with SHA-1 bc84a790 is already in history

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

Change-Id: I76102addb3391e8498be1e6b0c5bc4cfbb7bce01