Merge "SystemUI: Display No SIM and phone affordance for RJIL"