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

Merge commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16'

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