Merge "Skip CtsPackageInstallerTapjackingTestCases on target watch" am: b7129568a0

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

Change-Id: I8e22b0db2512540a322a269314fc227c7f0d7a4a