Merge "fix null dereference on aeli" am: 00112c5a0a

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

Change-Id: I1bb8ff6be0f9880e32c2c2bbce411d284e6cc4ef