Merge "Fix some Telecom CTS behavior for presubmit" into rvc-dev am: 5c09ceb9 am: c8ac04d2 am: b1ce7864 am: 9d0a4a34

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

Change-Id: Ia0bc00eb0739b6377bdaeda36eb93adb1a135b84