[automerger skipped] Fix setupDataCall tests for osAppid am: 47213a189c am: 5b1e5e5472 am: e2f526c386 -s ours

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

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

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