Merge "mediaresourcemanager: add pid to removeResource method" into mnc-dev