am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev

* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update