Merge "Adjust mediadrmserver uid" into nyc-dev
am: 1ba1eeca71

* commit '1ba1eeca713c118ce12c97ac8bbdadbdd0cc5ff1':
  Adjust mediadrmserver uid