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

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

Change-Id: I32fd333dbe5e8ddd2fcd5fb2c81f168129e912b7