Merge change 8681

* changes:
  PowerManager: Add proximity sensor support.