Merge "Fix crash issue for VTS setupDataCall_1_6_osAppId" into sc-dev am: 0e122f340e

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

Change-Id: I0ce6e51c8234cb9b0003394486cc101e98a0020d