[automerger skipped] Merge "Fix setupDataCall tests for osAppid" into...

[automerger skipped] Merge "Fix setupDataCall tests for osAppid" into android13-tests-dev am: ff3de20b am: 12efbe49 am: 4ec6ff09 -s ours

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

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



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