Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
am: b9fa97dff7

Change-Id: I55e25e25612cbb11cec025ba21b6577d635f1df9