am ae960b2d: am 437821bc: Merge "Battery saver: new policy changes + SystemUI tweaks." into lmp-dev

* commit 'ae960b2dd146e091405dbe9c16c1868a6e9ef332':
  Battery saver: new policy changes + SystemUI tweaks.