Merge "DO NOT MERGE: Update TapJacking test for Automotive support" into stage-aosp-sc-ts-dev am: 050f971ce3 am: a3ac13ae07

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15889681

Change-Id: I16dd387403f2b4d4aa614d8408ced93cf8eda954