[automerger skipped] Merge "Update logic for enterprise connections" am:...

[automerger skipped] Merge "Update logic for enterprise connections" am: 5e2cf5f5 am: b0f40da6 am: 7ac76602 -s ours am: 440c34dd -s ours

am skip reason: skip tag Change-Id Ica20a458f46850d14a755a29a030d3eaa820b48f with SHA-1 35384a64 is already in history

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

Change-Id: I56021a0f3e8155b0243e43a6ca443bf22a1008e2