Merge "Merge "Add app label to AOSP sound picker." into rvc-dev am: 4e2cf864 am: f7556cd1" into rvc-d1-dev-plus-aosp am: 0a00b758

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

Change-Id: I4e69eaf80c5e9c4a53ed71f7790dac8a423cbb9f