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

[automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710 -s ours am: 12246605 -s ours am: eebbed92 -s ours am: 69f63f44 -s ours am: 8b97d6b8 -s ours am: b5228b53 -s ours am: 309b4060 -s ours

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

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



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