Merge changes from topic "am-a1052cc3f330488d8363a161f069d340" into udc-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: eedbce14 -s ours am: 7002cbea -s ours am: 947a7a58 -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: 3aa09eba -s ours am: f2e737f3 -s ours am: 038f8929 -s ours