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

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

Change-Id: I052d8dd0302f6b36fc93c67298a97e528a059f21