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

[automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba600 -s ours am: 7cb16189 -s ours am: 824728dc -s ours am: 629e93f0 -s ours am: 93f0bf82 -s ours am: 411b8d6a -s ours

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

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



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