Merge "fix null dereference on aeli" am: 00112c5a0a am: 06b7deb347 am: 5809caff94

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

Change-Id: Id1535f29a43980bab3117587ffe83b22584a102d