Merge change 22692 into eclair

* changes:
  PowerManagerService: Disallow all user activity when in proximity wake lock.