Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: 69c7197c3e am: 823462999a am: 81ff0c0523

Change-Id: I640280c22f565433eb147bd94d1703d05d60b36d