Merge changes from topic "libbinder-remove-mediaresourcemanager" am: ca8f637b46 am: 9ff3f243b3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662925

Change-Id: Ia2e1144e2202539b54c8625c4cc2da8d381e5d26