[automerger skipped] Merge "Fix the failed case for the...

[automerger skipped] Merge "Fix the failed case for the VtsHalRadioV1_5TargetTest.PerInstance/RadioHidlTest_v1_5#sendCdmaSmsExpectMore/0_slot1" into rvc-dev am: 27c9426e am: fb059aa6 am: 8c4ac978 -s ours am: cf0e3fc0 -s ours

am skip reason: Change-Id I1d6214f58850d707520b80634cb93d0e0cc712bb with SHA-1 62ffe870 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11885229

Change-Id: I6345a65eb33114082bc6827d665bfa2d8cc4a86a