[automerger skipped] Merge "Add the ability to remove FeatureConnection...

[automerger skipped] Merge "Add the ability to remove FeatureConnection callbacks" am: 2f3350dd am: d9038dca -s ours am: 77ce2477 -s ours am: a5c6afca -s ours am: 849f1bde -s ours

am skip reason: Change-Id I28dc51b10dc230bc8f7a03b7373510cf3a29e93a with SHA-1 4800b6c9 is in history

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

Change-Id: Id8b521b5f5f7721aa353ef30095b1fc8e5b084b6