Merge changes from topic "am-de52e7c0a3e74a1493bd0477e0125080" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-v2-dev am: e49a9b66 -s ours am: 9ea00329 -s ours am: 14256cb9 -s ours am: 24bfa272 -s ours am: 2354a870 -s ours am: 44aeaf31 -s ours
  [automerger skipped] RingtoneManager: verify default ringtone is audio am: 0a4792b6 -s ours am: cac3cd48 -s ours am: de1502fa -s ours am: 7864da39 -s ours am: 485ab554 -s ours am: 11176680 -s ours