[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: cfe723bf am: c56658f9 -s ours am: 652500cf -s ours

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

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



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