Merge "Add null check for osAppId" into stage-aosp-udc-ts-dev am: 848650fd00 am: b668cff7ff am: 9013cccc6a

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

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