Merge "fix potential read null pointer" am: 48584672 am: e2728c64

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



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