Merge "Handle IllegalStateExceptions in CellularSecurityPreferenceController" into main