[automerger skipped] Merge "Revert "Revert "Fix CarrierServiceConnection binding leak in CarrierConfigLoader""" am: 9408ba2d48 am: c4f74be16e am: ee7f3f5df0 -s ours am: a96b2274c8 -s ours am: bfb888b812 -s ours

am skip reason: Merged-In Ibedad9118c86318958a03e82c86d819c135cd628 with SHA-1 b0f3e2f004 is already in history. Merged-In was found from reverted change.

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

Change-Id: I1cf70d691c15ddd88775078096d23362e4a527e0