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

* changes:
  Merge changes from topic "am-68039f13df714ca3824e04b60c1d4d8f" into udc-d1-dev-plus-aosp am: 232e5c64 -s ours
  [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 am: 8f4af3cd -s ours