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

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

Change-Id: If52448804e172e29b28900b8aa67914cbb6b2eba