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