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