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

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

Change-Id: I06fb32bef7f6b713b96170b99e7beef55148e04b