am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread

Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.