[automerger skipped] Merge "Even though the state of the ImsFeature is set to...

[automerger skipped] Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36 am: fe94689e am: f5d90cd6 -s ours am: 42b6ca6a -s ours am: 6086fd21 -s ours

am skip reason: Merged-In Ie5fdc093701a6a1602372a80125629e96d7775bf with SHA-1 6d19fa7d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547



Change-Id: I0d0cecd75f6829fa6739977e7a0b85ca9ffd586c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>