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

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

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



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