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: Iafe2df5213100ebe99e925bcedb8dcb98e78a735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>