[automerger skipped] Fix setupDataCall tests for osAppid am: 91e2e5196f -s ours

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

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

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