Merge "Fix "TelephonyRegistry notifies wrong data status""