Merge "Merge "Update media resourceManagerService with the Application pid" into rvc-dev am: cea1d98cde am: d01cca87de am: 572b1f1942" into rvc-qpr-dev-plus-aosp