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

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

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