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

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

Change-Id: I7f67aea7e5329a8df8e8d4e0d3dae337287872c2