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: If65c572197c4c70b2664ee463ad9b577225345d4