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

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



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