Merge "Revert "omni: Set default ringtone for SIM 2"" into android-11