[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3 am: dd3baf3304 am: 58d7dae053 am: 81dfe2bfec -s ours

am skip reason: Change-Id Icb65aead4b5544182c46101f4ba535f5955ebd6c with SHA-1 b985677a9e is in history

Change-Id: I9948ceac824b2aa5ff9d76b99988e0f38f7909cc