[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for...

[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a2 am: 6315e164 -s ours am: bf095a51 -s ours am: 6cb16367 -s ours am: b490f37e -s ours

am skip reason: subject contains skip directive

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



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