[automerger skipped] Merge "fix potential read null pointer" into tm-qpr-dev...

[automerger skipped] Merge "fix potential read null pointer" into tm-qpr-dev am: eb700117 -s ours am: 7c85478f -s ours

am skip reason: Merged-In I915aeea4e6a1ab06ca2c86c78f3f27f1046d38a1 with SHA-1 1d26007c is already in history

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



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