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

* changes:
  [automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-qpr-dev am: 6ce832b6 -s ours am: 53b2ef02 -s ours am: 71f02e79 -s ours am: 31f54e3c -s ours am: 782296ba -s ours am: e13f7e2d -s ours am: 339b0bd1 -s ours am: d3122bfe -s ours
  [automerger skipped] RingtoneManager: verify default ringtone is audio am: ae281971 -s ours am: 5f7f5189 -s ours am: 32737661 -s ours am: 580b8a3c -s ours am: 515faddc -s ours am: 7c807729 -s ours am: 4988fff2 -s ours am: a8517e06 -s ours