Merge "Merge "media: clarify keys used for CodecCapabilities.isFormatSupported" into rvc-dev am: db6e11150c am: 0511013257 am: 24f269e6b0" into rvc-qpr-dev-plus-aosp