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