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

[automerger skipped] Merge changes from topic "IMS Threading Refactoring" am: a28bba3e am: 0cf00024 am: 64bc536b am: 783c1b7c -s ours

am skip reason: Merged-In Iffeedb669b4abb9b4f32f015aaea4ba3b99c00f5 with SHA-1 380f9be2 is already in history

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

Change-Id: I221758ac6e6baf88013c8d4de07aeda2f7c31857