[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: 88d41c14 -s ours am: 5ddb8f45 -s ours am: fce46f3c -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: Ie7fcc19bee65c34f9aa5c25bca421739493cb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>