Merge "Fix can't change notification sound for work profile." into tm-dev am:...

Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f43 am: 1340a91c am: ca0b0e7c

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



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