[automerger skipped] Merge "Fix MmTelFeatureConnection Memory Leak" am: 6b8e4bdf am: fb2050f9 -s ours

am skip reason: Change-Id Idcf8b558c3807a3f9f5094afee532e76ea6f02cb with SHA-1 64e10132 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344916

Change-Id: Ifd5ad1980e7c2c6565d0c825caee9bec23f09da4