[automerger skipped] Merge "(ImsService API changes for Better IMS Threading)...

[automerger skipped] Merge "(ImsService API changes for Better IMS Threading) Fix Unit Test cases for opt/telephony" am: a9919c66 am: 7efe1ad5 am: 11a9eebb am: 6b1b8c07 -s ours

am skip reason: Merged-In Ic919f54d26cf864782531417081b41ea26e034d7 with SHA-1 930ed9af is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1958664

Change-Id: I2495696cb25fb155343ae16c610e759b613a186f