Merge "media: clarify keys used for CodecCapabilities.isFormatSupported" into rvc-dev am: db6e11150c am: d1334a1072 am: 6b0fbc18ee am: 11709c281a

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

Change-Id: I40a13738a4119dc1658cd0cf37267e2aa6bc035b