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

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

Change-Id: I830b78304e123c91dd95ba6b9580f2980b9db8b5