[automerger skipped] Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: 69c7197c3e am: 823462999a am: 81ff0c0523 am: 56a56e2ef9 -s ours

am skip reason: Change-Id I72a10c98adad4a236dbd445cefe5f37c4ec3fd81 with SHA-1 13b168530a is in history

Change-Id: I9640467530b4e197c7cc5dd0095c91fd1eebed50