[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011f -s ours am: 709a5df6 -s ours am: 52a571f2 -s ours am: 86b1ff35 -s ours am: 0d51854f -s ours am: d76d5d28 -s ours am: 8b0f218a -s ours

am skip reason: subject contains skip directive

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



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