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

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

Change-Id: I6174555039df8a041d5dc21bc57351c23b392ef2