Merge "Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a am: b8184410" into rvc-d1-dev-plus-aosp am: 9d40364e

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

Change-Id: Ifb66061a2fea32a462a7dc85c10723f28d1db5c2