Merge "Add null check for osAppId" into stage-aosp-udc-ts-dev am: 848650fd am: b668cff7

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



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