[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned...

[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: 69c7197c am: 2a88a209 am: 91e34af9 -s ours am: d55d0eaa -s ours

am skip reason: Change-Id I72a10c98adad4a236dbd445cefe5f37c4ec3fd81 with SHA-1 796fbbbc is in history

Change-Id: Iff32a52027035934e866b8ac1ee51bfb50271ce3