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

[automerger skipped] Merge "Fix setupDataCall tests for osAppid" into android13-tests-dev am: ff3de20b -s ours am: 7594ec0d -s ours am: d9a32007 -s ours am: 7fd9e0b1 -s ours

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

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



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