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

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



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