[automerger skipped] Merge "Manually call removeImsFeature in IMS compat fw"...

[automerger skipped] Merge "Manually call removeImsFeature in IMS compat fw" am: fa79aa44 am: 51353bd1 am: 420ac032 am: 6d6af34c -s ours

am skip reason: Merged-In Id86f2f897962fe1715989150fe6ec0f045aea2c1 with SHA-1 c65fe644 is already in history

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

Change-Id: I29b78589eee90fc9f0e1e9abad5343882d4daac7