Merge changes from topic "am-99a4f1e9b37341c68410eecb699d0497" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88 am: cb82328f -s ours am: 4b96cb93 -s ours am: 12f11b06 -s ours am: ab3adbd4 -s ours am: a58d975a -s ours am: 5f46cdb7 -s ours am: c47ee0a8 -s ours
  [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf44161 am: 99a7a61b -s ours am: 22248834 -s ours am: 2a665430 -s ours am: 2e3f8a30 -s ours am: ecde630b -s ours am: 05728261 -s ours am: 08c707a6 -s ours
  [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b3 am: 58880a0b -s ours am: 1e688667 -s ours am: 1da60c2f -s ours am: 4129c273 -s ours am: e6135eeb -s ours am: eb1d86b6 -s ours am: b356e927 -s ours