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

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

Change-Id: Ie3c5e468d3382838b3b119df24383c1f93ec64a5