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

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

Change-Id: I76ae55e8e23c6bfca623762eae2ba36023b6d194