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

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

Change-Id: Idd83407d44ad9152a0ded72d5d7606ecdb69e2ff