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

Change-Id: I94968a08387682d6afeb23d6bfe396d2cf53eb5d