Merge changes from topic "IMS Threading Refactoring" am: a28bba3ebe am: 0cf0002495

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

Change-Id: Ieeee66f67e779b33c40d3ce01023120d943fa585