Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 am: ac569866d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef5f798a545f21752b56d6a3134f3179d323734