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

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

Change-Id: I724f53e81675a63960925f18f7a253487021f0c3