[automerger skipped] Merge "Fix collection assertions in carrierapi test." into stage-aosp-sc-ts-dev am: 1cd6fd5afc -s ours

am skip reason: Merged-In I2672080e3aac7bf3c01a62b29fd6d7558362e52b with SHA-1 bf144a88b6 is already in history

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

Change-Id: I7a6efd2fe4642342ef21914fa58fd734a48b5334