Merge "Enter to touch mode by down or scroll event from any type of a device....

Merge "Enter to touch mode by down or scroll event from any type of a device. am: 718c4da0 am: dcc33a4f" into rvc-d1-dev-plus-aosp am: 5a5e0760

Change-Id: Ia7e285a421415b6846ed723d1f03ef90bb815d4c