[automerger skipped] Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master am: b9fa97dff7
am: d8fe7f5796  -s ours

Change-Id: I94f76a0f575fcc36ccf9444ba4bc93c667ea3b4e