Merge "MediaCodec: require Crypto/Descrambler object for secure codecs" into main