Merge "[DO NOT MERGE] Fix Stylus CTS by checking startInput" into stage-aosp-tm-ts-dev