[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: 94613277 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11545659

Change-Id: I35fe5b1008c8651ec49f00480ebb12754448aefe