Merge "Implemented EV_BATTERY_DISPLAY_UNITS" into tm-qpr-dev am: 7079fbd4f4

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

Change-Id: Ic359a8ea6728a92f61883f3e826711fa6d05ee16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>