Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev