Merge "Fix collection assertions in carrierapi test." into stage-aosp-sc-ts-dev