Merge "media: clarify keys used for CodecCapabilities.isFormatSupported" into rvc-dev am: db6e11150c am: d1334a1072 am: 657bf4346f

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

Change-Id: I3adc9ddf1fae4f6f02b752c11fe12e97f0b22594