am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
  Fix issue #5642121: Proximity sensor didn't turn the screen on in call