Merge "Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a am: ad8ebec2 am: a0c6eadc" into rvc-qpr-dev-plus-aosp am: 48d7a52d

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

Change-Id: I4baad8a0312073e2b456eb790de83dc69d99f375