[automerger skipped] Merge "Fix ENTERPRISE failures for duplicate CID and no...

[automerger skipped] Merge "Fix ENTERPRISE failures for duplicate CID and no default data" am: 3ebfd92f am: 4d96a97a -s ours am: f0202d8e -s ours am: 22db0936 -s ours

am skip reason: Merged-In Id5b3a13fc5afb9908359321d2196802ce890e5a2 with SHA-1 5b27b121 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1729715

Change-Id: Ia2cb1ddd80950f63671245040362d4f140e8cadd