Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72

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

Change-Id: Ie86ded6787f3101357591d569fcdb1960c5510a3