Merge "CTS: Use correct signal for detecting click()" into oreo-cts-dev am: 8f5a3c13eb
am: 782d19c6ff

Change-Id: Ibde82036f378a252b61f18be260bcb015e44b0ff