am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev

* commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)