Merge "fix potential read null pointer" am: 4858467222

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

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