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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803042

Change-Id: I6189e1786aa0b13dfe88a319cfc7651fcaa108c5