am 6acb240c: (-s ours) am 43ed8e15: am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev

* commit '6acb240c533e405e8793537b2aef0d7ee3f527e0':
  healthd: Adds fake battery properties for devices with no battery.