[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: 1e61b652 -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: I0eaef9bc0e8844b3ee0fdc036d7510d14bfc41d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>