tree b334aa067bf3ac95023109099800dc67c4908a1f
parent ca69d77755a413496e46d1db99f6c32db6b4b347
parent 74e845e2dc4f1e4df660789a0767a48752c6067c
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> 1629850628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629850628 +0000

[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