Merge "Fix potential nullptr dereference" into udc-dev am: c5917626

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22478169



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