Merge "Fix ANR of SimSlotChangeService" into udc-dev