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

Merge "Merge "media: clarify keys used for CodecCapabilities.isFormatSupported" into rvc-dev am: db6e1115 am: 05110132 am: 24f269e6" into rvc-qpr-dev-plus-aosp am: 0399ad72

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

Change-Id: Ie105c54f4bbe5f4ba931b147c7e7b8c791a2eb7e