Merge "Adapt package installer tests for watch" am: 2b80a95295 am: f00521faa5 am: ec52910ea4 am: d8f5598b1c am: 49a655757a am: d856139327

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

Change-Id: I78ea6d6fcfb8a1a93eb6a65c1c8d74d9d9e81e8b