Merge "Fix some Telecom CTS behavior for presubmit" into rvc-dev am: 5c09ceb989

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

Change-Id: Ia7e3a5eb317b4accca92439d0b3219c54364e751