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

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



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