Merge "Remove tee_device access from mediaserver" into nyc-dev