[automerger skipped] Merge changes from topic "IMS Threading Refactoring" am:...

[automerger skipped] Merge changes from topic "IMS Threading Refactoring" am: ba3f276e am: cdfa9cde am: 7d391dde am: 4287e4f9 -s ours

am skip reason: Merged-In Ia449ea7461c3b29c409177349d226283be230e98 with SHA-1 1096ddcd is already in history

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

Change-Id: I9664bcf41dd7c87dbed316a0839c650e4478840a