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