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" into rvc-d1-dev-plus-aosp am: 0a00b758 am: 66a9b7e2

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

Change-Id: I36addf32df01be67f7e7f69d73766eb01c89d365