[automerger skipped] Merge "BatteryMonitor: report current_now in uA" into...
[automerger skipped] Merge "BatteryMonitor: report current_now in uA" into rvc-dev am: d4cc1549 -s ours
am skip reason: Change-Id I675be1ae645413b9494af4a5d49955aad5bd4f2e with SHA-1 e5bd5f91 is in history
Change-Id: I4c1750be1588e21da0d263be1448d627097d7783