[automerger skipped] Merge "Add default Sound Picker package name" into tm-dev...

[automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f81 am: 6608cb54 -s ours am: d601d2ef -s ours am: 0eb554fb -s ours am: 9a2fd9af -s ours am: 7159ce70 -s ours

am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31043662



Change-Id: I155084013b30eab2983ca274de13a28e8ed68395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>