Merge "Use BTN_TOUCH or BTN_TOOL_* to determine if touch active. Bug: 5064702"