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

* changes:
  Merge changes from topic "am-5f6c0eda64b74e83870ecb800fe03f1a" into udc-d1-dev-plus-aosp am: a25be2ce -s ours
  [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 am: f58f319f -s ours