[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: 69c7197c3e am: 2a88a20906 -s ours am: 5507d89817 -s ours am: 0a55605e0e -s ours

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

Change-Id: Id93a1d9d5f098b36ee0bcf9ccb0d53fef73adba8