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

Merge "fix potential read null pointer" am: 48584672 am: e2728c64 am: 43d0c0df am: 937c37c7 am: da612e70

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



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