Merge "Add null check for osAppId" into stage-aosp-udc-ts-dev am: 848650fd am: b668cff7 am: 9013cccc am: d1700671 am: 23f14b59

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



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