Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev

* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone