Merge "Merge "media: clarify keys used for...

Merge "Merge "media: clarify keys used for CodecCapabilities.isFormatSupported" into rvc-dev am: db6e1115 am: d1334a10 am: 657bf434" into rvc-qpr-dev-plus-aosp am: dacb3487

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

Change-Id: Ib5f3cc7f55e6a863c87d94aba16d1a8334abe3c3