[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc3 -s ours am: 79786177 -s ours am: df830ac3 -s ours am: ddc4cbe1 -s ours am: 8ba2996c -s ours am: 6798bdac -s ours am: 4a38992e -s ours am: 5dcde87d -s ours

am skip reason: subject contains skip directive

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



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