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

* changes:
  [automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-qpr1-dev am: 51afe644 -s ours am: 36704e18 -s ours am: cc68bc1f -s ours am: ff7524b9 -s ours am: 8c4f3f7a -s ours am: c800689f -s ours am: 0234731f -s ours
  [automerger skipped] RingtoneManager: verify default ringtone is audio am: 30c9b4ef -s ours am: c579e62b -s ours am: e657fba6 -s ours am: 9bab66e1 -s ours am: 1cdd10d4 -s ours am: 9868d4e9 -s ours am: 221f1b85 -s ours