Merge changes from topic "am-53acc8fd2c374966b4bb0790e2de1d7c" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-dev am: 9fef491b -s ours am: 9e995f55 -s ours am: 0404c24f -s ours am: f183fcb0 -s ours am: 4ceb826e -s ours am: 36ae571b -s ours am: eb20498f -s ours am: d1e3874b -s ours am: f93f295d -s ours
  [automerger skipped] RingtoneManager: verify default ringtone is audio am: a67982c9 -s ours am: b2a9729e -s ours am: 59a5af97 -s ours am: 1feffa46 -s ours am: 1b0a6d94 -s ours am: 70646bc8 -s ours am: ae89792b -s ours am: e101e539 -s ours am: 5a09689f -s ours