Merge changes from topic "am-b5421922aba842e3a3578d8982fc5eb2" into udc-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: cfbcc6dd -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: e8d502fc -s ours