[automerger skipped] Merge "Fix collection assertions in carrierapi test." into stage-aosp-sc-ts-dev am: 1cd6fd5afc -s ours am: 8da98d8c60 -s ours am: 74e845e2dc -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: Ib18f2b485ba9daf3496d90b8e141f3582fa63193