Merge "Fix null check" into udc-dev am: 49ae1e4a am: 5c925a75

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



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