Merge "Syncronize frameowrk and ImsStack operation for ImsFeatureStatusCallback." am: 691bfb642a

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

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