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

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

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