Merge "Add app label to AOSP sound picker." into rvc-dev am: 4e2cf864cd am: f7556cd108 am: 6604f5a6f1

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

Change-Id: I0057a2f922923bcef71dc846e337d81a460cad0a