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: Id2d8b1c03ee685c0d0bca85ac9a569102d8aa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>