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