[automerger skipped] Merge "Provide BatteryControllerImpl" into rvc-dev am:...
[automerger skipped] Merge "Provide BatteryControllerImpl" into rvc-dev am: 7da465dc am: 6db23c27 -s ours am: 8505151e -s ours
am skip reason: Change-Id I064442fcf56397ba6394ee98ccf9cc82e589a0e3 with SHA-1 bfea51f4 is in history
Change-Id: Icb7997c4b4291284d9dcffdbdec0315a5441da44