Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change"