[automerger skipped] Merge "Separate ModifyInstallerPackageTest cross package installer takeover test" into qt-dev am: 32115df629 -s ours am: d81f9c74b5 -s ours

am skip reason: Change-Id Iae070fa225e011f053b9cf61ee4c451e09171e9e with SHA-1 cea8b19c53 is in history

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

Change-Id: I998ddce434347d2ee6b4a921337d2a7acbd43dd3