am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.

Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-plus-aosp

* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.