[automerger skipped] Merge "Fix setupDataCall tests for osAppid" into android13-tests-dev am: ff3de20b90 -s ours

am skip reason: Merged-In I1b342bb7a829585607db4518bf4017e28b6db84f with SHA-1 47213a189c is already in history

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

Change-Id: Id25f193763ea3d07295ba0dc696c0f7304e148bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>