Merge "Fix SystemUI mapping SIM state error issue" into udc-dev