[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a -s ours am: 00cdaa22 -s ours am: 3e42752f -s ours am: 65dd9235 -s ours am: 42fcccd7 -s ours

am skip reason: subject contains skip directive

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



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