Merge "Fix setupDataCall tests for osAppid" into android13-tests-dev am: ff3de20b90

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

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