[automerger skipped] Merge "Syncronize frameowrk and ImsStack operation for...

[automerger skipped] Merge "Syncronize frameowrk and ImsStack operation for ImsFeatureStatusCallback." am: 691bfb64 am: 6804c6a1 am: 41e83466 -s ours

am skip reason: Merged-In I42dfb45e15dda0f2bf6a11263edf3a7920a4140b with SHA-1 942c4635 is already in history

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



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