Merge "Fix some Telecom CTS behavior for presubmit" into rvc-dev am: 5c09ceb9 am: c8ac04d2 am: 12243e18 am: eb33f758

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

Change-Id: I73264580e13ecd8ed993a428f3667793f59ed571