Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3 am: dd3baf3304 am: 58d7dae053

Change-Id: I66f63271a4ed82d8b0ef48e728057da2480bd1a9