[automerger skipped] Avoid null pointer dereference am: 688cec6e am: 4ec4fea4 -s ours

am skip reason: Merged-In I9bf705a4f543011cc35505b34dbd664f1f40f80f with SHA-1 688cec6e is already in history

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



Change-Id: I31e362e5bc7f6cf94f0a6893ffeaded53c7dce0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>