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 am: 62897d0e
Change-Id: I9a87087d4ce278593b1f5a013ca8add48cf48aca