Merge "Merge "Add app label to AOSP sound picker." into rvc-dev am: 4e2cf864...

Merge "Merge "Add app label to AOSP sound picker." into rvc-dev am: 4e2cf864 am: f7556cd1 am: 6604f5a6" into rvc-qpr-dev-plus-aosp am: 4c1fa05b

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

Change-Id: Ic5c180841614572b75449d138bd3e1d737e530de