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

Change-Id: Ie75d0971e6a343aad489a1fc5a083fda8060224f