Merge "Merge "Update media resourceManagerService with the Application pid" into rvc-dev am: cea1d98c am: 622f9f44" into rvc-d1-dev-plus-aosp