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

[automerger skipped] Merge "Add default Sound Picker package name" into tm-qpr-dev am: 4188f571 -s ours am: 537a4c96 -s ours am: f60233c5 -s ours

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

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



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