Merge changes Ie17eedfd,Icb80843a,If1619c10,Iee23682a

* changes:
  AOD: Add wakelock for charging text while dozing
  AOD: Show charging status on AOD1
  AOD: Fix default for always-on setting
  Revert "Revert "AOD: Refactor always on configuration""