Merge "Make CDMA Call Options UT aware" into sc-dev am: 1a14f284a9 am: 33e84f657a

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

Change-Id: I46e09d183f4d21bf156fb3a85b222c42b45757ff