Merge "media: don't expose private keys in MediaFormat" into nyc-dev