Merge "priv_app: allow access to mediadrmserver_service" into nyc-dev