[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: edf44161 am: 99a7a61b -s ours am: 22248834 -s ours am: 2a665430 -s ours am: 2e3f8a30 -s ours am: 2abeb254 -s ours am: 9c070af4 -s ours

am skip reason: subject contains skip directive

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



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