[automerger skipped] Merge "AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API" into main am: 154bca018d am: a3e68188a8 am: 5679f37c97 am: 0544a190b9 am: df38a3557f -s ours

am skip reason: Merged-In I8ebd8d4b8cbb6751fd687db361a0aadd0b0d166e with SHA-1 de94b95a00 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159

Change-Id: I5f607e75cf92884b16e5e751c1d5ef73a345624e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>