Merge "Merge "Add app label to AOSP sound picker." into rvc-dev am: 4e2cf864 am: f7556cd1" into rvc-d1-dev-plus-aosp