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: 58cc75e2 am: a00962e0

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



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