Merge "Move ImsResolver to a singleton pattern" am: bdaab6533b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1709534

Change-Id: Ia9b2aab404332c94b9ea3c2c0b335de954c90bb9